Refactored Operations into their own classes