Lots of changes
Revised code to facilitate more organized experimentation.
Replicates Nikhil
Nothing
confused
reconciled sim and master branches
nothing major