Made a few more changes, added a few more classes