Refactoring to allow for non-mobile-spec apps!