reorg; bring octal-app inline with fall 2013 work in another repo