knocking out some todos