Nicolejeffery/cosim2/new branch

Merging to Mark's branch