GIT Commit

this is the whole she-bang - hope I don’t break anything.
more commits