Merge pull request #2 from jamiehannaford/pr/475

Adds list extract function and squashes struct