Added class notes and TODO's in bold