Update

Pet stuff and separating out the settings menu.