Getting cody's code merged still
finished merging cody's changes