Inital commit of basic infrastructure stuff