First full commit, all files present. Needs tidying