First steps at moving to global, #184