Working on new syntax

Needs testing and docs update