Closes #119 assuming it works.  This should definitely be tested and wat...

...ched closely before pushed to a live server.  If I made a mistake it could result
in all kinds of retardedness, not limited to:  major memory leak conditions, destroying items it shouldn't, impregnating your dog, etc

If merged in to master, delete this branch.  It was created specifically for this fix.