initial merge of local files
some initial changes