David Price

Merge branch 'add-more-magic'