Pull Request for Issue620

Yeah. When we try to get this up and running on VESPERS, REIXS, or IDEAS we're going to need to run through the edge cases and catch everything :(