Add obstacles, unify person code