Strengthen types
Merge /Users/abakst/Research/csolve-webserver/mongoose into ccs