Started to move some FeatureHandler methods into classes, added tests