Some more work on things, some utility methods.
Merge remote-tracking branch 'origin/development' into development