Yep, Bad Commit. Moved stuff around
Make this actually extract values, return a sane data structure as well