Reorganize and implement more stuff

Weee!