First rewrite of normal builder, RPN is next