messed something up with git and had to start again, lost all old commits...work is done