#2 Deleted debugging code & added TODO's