Most TODO's complete