possibly the wrong direction.
More changes, Need to switch disgusting ifelse cascade to case statement with ifs