moved some options into the main file until I figure how I want them exactly out