Implement more stuff
Rename everything
Make everything work