The code contains many ToDo comments. Clean these up from the source code and create appropriate tickets for them.
