TODO's
Updated pdf