Additional todo comments