first set of changes being pushed with Andrei's help.