Feature/arc pm

review by @rmg, destined for @seanbrookes