bug fix, v1.1 for production
switching
switching back
going to merge
files merged
added new notes