merge. Still missing accuracy and oder for wave and heat as well as part 4.