Add posn class.
Added match class.