Added todo about figure