Latest set of changes - almost ready for launch