Half of new dialog refactor done. Semi-functional