progress with TODO flags added