WIP

* Did some stuff. Clean this up later.