kinda stubb'ed the old config out for now and tacked it onto the new