-completed basic collision solving and resolution