All N-N combinations should be working
Ooops, accidentally added class files