First huge round of changes
First Script complete