Changes to the create script, moved some stuff out of init