Aden 1074 adengine hop

Don't merge this yet