SO CLOSE: refactor collision detector, do display update