Collision correcting

runs very slow now. Whoops.