Moving things around and making the initial rundown list easier to read