part 1 of performance improvements

The is best part is still coming.