Forgot a couple of todos :D