Lots of progress on #59

Ready to start testing