added todos for final milestone