working on #80, ready for testing