Removed fluff, added TODO