Fixed merge issues, commiting special code.
Added in Linda, trying to get collisions working correctly with the new model.