contrast should now work
modularization
modularization cont'd
further consolidation
minor changes
Merge branch 'master' into ref-implementation
Merge branch 'ref-implementation'