- Added Singleton class (activity). Still needs fixing