Added concurrency
Code cleanup
Revised resolution flow; added collision handling stub