Add priorities for TODO items
Complete some TODOs, add more.