major update - ready for initial demo