More classes, some other changes I did before I had GitHub set up