AMD rewrite nearly complete. Some async resolve issues to address before finalising.