Added a bunch of stuff that i'd like to be able to do