Added in some todos