part 1: put stuff in the DataManager!
(same as part 1)
part 2: fixed add function