Made some tweaks but still working on collision.