Abstracting App, misc changes