Large update, almost have basics working
Oops