Rework in progress
Merge branch 'eecg' of https://github.com/charliehorse55/esb into eecg

Oops