WIP more work, closes #25 and #35