Added tags and TODOs, and generated some errors