Reverting to original addLabeledFeatures since the new implementation
was horrendous.

Need a fix for this since the original implementation has position
features.
Updating TODO message