moved stuff into config file