Added the basic scaffolding