Cleaned up some commented-out material
Started some forays into accounting for statsValues overlap