init commit
tracking
merging into master nad tidying