[AM] Refactoring

Testing in the near future!