WIP: still moving things around.
WIP: Still moving things around, but getting closer to a solid structure.