Work on #78 and #79

I think these are both done.