almost works new syntax
some progress