cut some fat out. We still need to organize this better.