Merge validation code back in
Remove extraneous check for token in area
Remove extraneous check for token in house