Made sure everything worked and committing final 2.0