Move this to an 'App' object?