Initial stab at multi key support