Not functional (yet), but more structure added to the script