Finish Q-expressions implementation