Multiple changes, file movearounds and todo comments in place.