Merge remote-tracking branch 'upstream/master'
refactored to assignments
merged from michaels code
Merge branch 'master' of github.com:sebarmano/hwtracker