Further work on implementing feature extraction.