HUGE COMMIT. We will be working from this branch from here on out. Commit often.