some stuff
merge done?
two quirks.