WIP on integrating sub-parts better with the rest of the app.