First pass for Perry #25

Hmm.. looks like someone was working on this already..