Initial commit for POPL 2014 attempt