Initial work with the basic scaffolding