Some work on editing the script, flushing out scoring