Broke down into smaller bat files, fixed path issue