Dev's Changes

committing changes dev made directly to the server files.