moved the setup, changed a few things.

goodytwoshoesx