commiting initial work to master
squashed from "initialwork" branch