First Commit of AOD still working on the background