Almost there. Feel free to solve my TODO's