Replace H1 with H2
Update TODOs