Made a minor change to ExercsideAdded and added some TODO's.