Moves generic AU functionality, see #68