collision is working better, but not completely working yet.