Previous commit part 2

apparently half the changes didn't commit.