continued work on #1
still missing tests for the new feature