More general tidying up code, ready for merge soon, I think main.py should do something first, but I'm going to merge anyway!
Merge pull request #22 from cougarTech2228/working

Working
edits
Merge pull request #23 from cougarTech2228/(not)working

edits
Merge pull request #24 from cougarTech2228/master

merge