git is a mess. Commit of non workin code because git can't marge trivial
changes...