Modified a lot of stuff, namely started putting things into classes that I used to have in main()