first commit to streamline configs