more things done, collision code import in progress