Added some TODO items, removed property from DM.