Placed TODOs to reflect all the work lately