He proposed! After my suspicions regarding Friday's events (going to a champagne bar and "somewhere nice" for dinner) - he did it!
I still am in a state of disbelief... the ring is absolutely gorgeous, and he was so sweet to take into consideration that I didn't want a scene. It was one of the most amazing feelings and evenings ever... and now comes all the craziness!