PO partial

not quite done.

aaron, steve
Merge branch 'master' of https://github.com/kapace/cloaked-bear