Major Update

Stuff is working