[WIP] Refactoring towards ext-amp incl. new features

This is a work in progress and will not get merged, until it stabalizes.
wait timeout is missing