I think both of these are mostly working
Merge pull request #19 from bjacobel/connor

I think both of these are mostly working