config still shaky. renamed classes