"Genie of the Lamp" Companion System

Hi!

Im working on Arabian Knights style adventure game with a friend, weve got alot of it working, its going good!

But we've hit a snag lately. One of the Side Quests/Companion Quests is when you find a magic lamp.

When you rub the Magic Lamp, a genie appears, and she gets added to your party as a companion. She performs all the normal dutys of a companion, such as you can talk to her, have her help in battle, etc. But we need two extra things:

Genie Of the Lamp:
Shes a Genie. Shes bound to a lamp. We need a way so that, you can call her to and from the lamp, as long as you have a companion spot empty. We were thinking something along the lines of a permanant item in your inventory, the lamp itself, that you would "Use" which would summon or return her, to and from the lamp. Any other suggestions are also useful!

Wishes:
We need a simple wish system, that gives bonuses or perks. Like Extra money, tempoary abilitys, or disatrous problems like random teleportations or catching yourself on fire! :p We need it so that once you make a wish, she needs to recharge in the lamp for a set amount of time.

What do you guys think? We would be very gracious, and give credit to anyone who could help us.

Best Regards!
-Sean