working, needs refactoring
Merge branch 'master' into restructureA
working directory clean, git errors fixed