More images and less TODOs