Last commit before restructuring

Misc revisions before restructuring.
-intro requires work