more reorganisation. now to write some text!