minor collision refactor + wip