Updates to Engleton and base class
Merge branch 'Engleton' of https://github.com/SuperScope/Dieseland into Engleton