temp commit, working on asserts
merging changes