added todos for exceptions