committing changes so i can merge in lou's stuff