Added comments where features are not implemented