Updates for first demo release of the system. Need to rename