In the wake of continued controversy and an effort in the state legislature to simply abolish the town , an agreement was reached in 2003 to provide for the incorporation of the remaining portions of the town (by then down to less than 3 sqmi , including bodies of water) into the city of Madison and the city of Fitchburg by October 30, 2022.