interim commit, moving from osx to ubuntu
temporarily adding old version's code, to be able to peek at it