Merge branch 'chris', remote-tracking branch 'origin/chris' into chris
first working version
old changes
merged