Fix #37 (need bit more clean up but start here)
Streamling #37 fix a bit; would be neat to have a machine to run BE tests on...