Updates to script. WIP