Reorganized beginning a bit.