Updates and additions

Still building the script.