filled in all todos
redid intro