Starting to fix up the initial script