start working on fix and add some FIXME's