We chopped the wax into 1" size pieces, which was not at all easy, and placed it in a double boiler to melt. Once the wax was melted, we slightly heated the oil so the wax wouldn't congeal when we combined the two. We poured the warm oil into the wax and mixed with a stick.
We then scooped the liquid salve into small jars and added a few drops of the essential oils we made last week. Since we didn't have much oil we also used some of the hydrosol, which needed to be mixed vigorously because it is water based. The wax congealed rapidly once in the jars and was immediately ready for use.
One thing to note is that melted beeswax is nearly impossible to remove from the equipment you use, so if you intend to experiment with it, designate one vessel and a few tool for it because they will never be able to hold anything else.