TODOs resolved