Added more stuff
Added some functions