Moving apps back out, lots of model work as a base