Added comments and TODOs.