ADDED TODO's for the workshop