starting on new hw
first pass
getting there
Merge remote-tracking branch 'origin/master'