Marked some todos