view and controller essentially working as desired
Merge branch 'master' of https://github.com/Spitigala/ESA

bfjhbjhsdbjhsd