WIP commit

primoc errors: http://pastie.org/5874185
primou errors: http://pastie.org/5873668

Uploading so that work can be resumed even if
data is lost on my buildbox.