Yes, will rebase on this once I have an idea how to move timestamps through ae.