Modified to not exceed 80-char count per line
Updated TODO list