Updated collision system to work with arbitrary shapes