Quick Type fix
lots of  test scripts
NEED TO FIX application logic with TrapLocation class interaction with user data