Starting to add more of the tools, including the settings