Fixed some whitespace problems. Added more code.
Split some code into a scrap file.