Noted some @todo's.