Added some TODOs and better output.