Added collision checking in the client (still broken)