Improve TODO and add first currentcost class template