added needed todos