Added TODOs. Put in hack to work around bug stemming from DB issues