Added some new classes for feature extraction. Middle of refactoring to move away from notebook session