added todos from spec