Added comments and todo