Organize
Add position output; add a bunch of other stuff that i thought i commit already??

Need to refactor
Clean up