Finished adding a few more classes