added interpolation classes
renamed pumps to queues and made it more 'queue-y'