Update to AE2

-EC1 will be continued in its own branch ;)