Mostly doctumentation

Also specified the TODO