First pass for Code Mash
Codemash changes