Added comments and todos