Good change, just a heads up that this may cause a merge conflict with @michaelbrawn's changes.