MVP design

Design changes in anticipation of mvp integration.