Expression class update to complete by me...