More general tidying up code, ready for merge soon, I think main.py should do something first, but I'm going to merge anyway!