Class structure finished (I do hope...)