Better documentation
Added todo