Hi! If you're willing to travel abit to Lausanne, then there's Ecole Agora that offers Classes on Saturdays as well. I took classes there last yr. and highly reco them if you want to learn thoroughly & are not under time pressure to reach a certain level by X months.

WWW.ecoleagora.ch / 021 311 65 06