Prelimenary work on advmode