initial commit
slight code reorganisation