Finished, not quite satisfied yet...