Updated script after initial import

Cleaned up a lot of remanents