Final working solution! Yay!
Merge branch 'master' of https://github.com/stubear66/600X