(COMMIT-22) Finished address controller