add a fixme
debug a bad match a bit. not much progress.