Initial push.  We on our way
Fixed merge conflicts