Finished up rearchitecting.