Work was duplicated. Merging in changes from branch, but leaving the master version as is in this commit.