Folgertech 2020 upgrades

Created by: Edward Gaulton