Refactoring Application
	Working on Caching the application NOW DELAYED