[WIP] changes to syntax and ammend tests to match.