Wip changes

merging back to master