can someone fix this better than me and remove FIXME's ?