Added quite a bit of stuff

Had a long period before commiting