Added comments and TODOs