I think this class is duplicating logic with whats above it.