Final Commit, wont work on this for a while