synced up with neil's stuff, made some fixes to the collision detecting, added call to server on/fail and added variable for user function waiting