Finished Kata1

Or most of it, anyway.