More work on the way to a working prototype
save work on github