grabbed latest scripts from server -- still need to review after taking a break from project