redid configuration and moved a lot of stuff around