Fixed everything so the correct NotImplemented was being used in the correct places