Refactored away pre-mvp system.