merge
Merge pull request #17 from brain-murphy/brian-branch

Brian branch
merge
meger
add all switch functionality
Merge louis changes