Finish migrating main app to core (Fixes #2 more)