Work on actor locating, refactor area code