Initial submit
Fixed merge conflicts