Further updates for 1.7

Removed unneccisary classes
Added milkshake for Heph
Added todo list item. Currently useless