Swapped Satisfaction into own class