I think you're classified as BP 1 if you have psychosis with your (untreated) mood swings.
BP 2 has "just" the mood swings. The new DSM has classified a whole bunch more types of BP...just what we need...more labels!!