Added TODO, implemented RemoveUnit