How the file looked before I realized about the tests

This is a version thats kind of a combination of the two. If you wanted to look at my code at around the time when I send you those messages, this is it.