Unless I screwed something different up, this was an attempt to avoid confusion by splitting things into two different pull requests (one for GPII-507 and one for GPII-508) - adding them incrementally should result in the easy123.org URL to be used consistently