Handle this TODO and the FIXME below?