Macro structure refactory done. Modals are functional.