Moving to public user

Still a few errors to be fixed