added todo comments..now 2/8