added avatar-collision-related stuff - though it's not ready to be used yet