Final Commit, fixed some problems, and took out some unnecessary code.