Moved stuff around...
Updated collision resolution logic for circles