TODOs and comments added