all important stuff done and tested. Composite tests still missing