Develop

I need to do some testing... But this is just a bunch of stuff that has been bugging me for ages.