Work in progress - mainly classification via fitting
Lots of changes...
more changes