Closes #1 add standard infrastructure stuff