Moved from token to matcher and added first of matcher functions