More work on scripting