[WIP] Starter App Cleanup

Refs #35