Started moving things around. Need to stub out the presentation.