Added reference. Moved TODO away from header