renamed things to make more sense. made header file pretty