First Commit, Needs some clean up!