Finished first round changes to feature_extractor.py

Still some serious logical work needs to be done.