Almost done with work on #49, need to clean things up.