Added more to Handin 2 DMAT