Re-arranging inheritance a little