test to see if we put the function in the right place.
Merge remote-tracking branch 'origin' into dbcreate