Most kinks with entity creation/removal worked out, need cleanup.