Working on TODO Items
Cleaning up execute script methods.