Intermediate commit- organizing code.