Fleshed out the setup file a bit