ALMOST DONE... JUST 1 MORE COMMIT... I CAN GET THROUGH THIS...