first couple of TODOs done