Lots of changes

I made a lot more stuff work