Started organizing step 2. Getting there.
Almost done woot