Added a TODO and some extensions