adding some todos & comments