Realy close to merging now

Almost ready for merging into master branch
still need some cleanup and move the functionality from test command to
a switchAtHome command or something