To many updates to list, amost a complete recode.
Merge pull request #1 from mattparks/master

To many updates to list, almost a complete recode.