Rollback TODO
Merge in Davids changes