initial commit / working stream but high cpu load
.gitignore merge conflict