Working on new syntax

Just needs testing