Added a TODO and possible extensions sections