Updated schema, working on login for badges