1st Commit w/ Susie and Jeeho

Commit combining Susie and JeeHo code. USE THIS ONE ONLY. -SK_12/1_9:55