Working through collision handling a bit more, still need better
handling of dimension scaling.