Further Neutron work
Fixing template scope
Refactoring user setup
Neutron work