Minor attempts to create globally available user.
Merge branch 'makeWave' into develop