Update with new script format

WIP.