Added some things, let's see if I can finally commit them