Supersedes #777

Moved this to it's own PR so that I wasn't messing with the composer lock file. This will supersede #777