Updated configuration to be a lot more fluid, and easier to work with.