filling in todos from kyles suggestions