added and now working with singletons for app and user