I went ahead and refactored this whole class, because there were a couple of issues.