Mostly finished OO structure

Fitting works, check outlines, P1 gives strange results!