ugly re-commit of the working part of code to new repo