On January 1, 2007, and thereafter, the Council shall consist of seven members, of which six shall be Council members and one shall be a separately elected Mayor as provided in Section 3.08 of this Charter, to be elected from the Municipality at large to serve overlapping terms of office commencing on the first day of January of the year following their election. All members of Council, including the Mayor, shall be elected to terms of office of four years each. Incumbents shall continue in office until their successors have been elected and qualified for office. Elections for members of the Council, including the Mayor, shall be by a non-partisan ballot.