Added mapping of drinks to spires, pickling of previous settings

Still needs lots of cleanup