First commit
slightl cleaner build
some basic scaffolding