Removed TODO and added relevant hyper-links