stashing changes
Fixed a bunch of stuff, almost done