30b9e66 Another hugh revamp, almost ready for testing complete workflow.