Update TODOs, adjust markup, add new method for the URL