#21 - Finished work on data extractor