moving a few things around - doing some more setup