Fix #7, Start of BuildSyntax move to factories