Final Commit before 1.1 Dev