Adding some structure for future scripts