Fixes #210

Completely changed the way entity spans are created/tracked.