Re-ordered some stuff to allow for initial setup