Dev1 to be merged into master

the progress we have made on dev1 is significant, and the way we are writing blocks and items is now much more time and space efficent