Add unfinished work on ueq/waldmeister