More progress on enchantments.

Signed-off-by: aPunch <theapunch@yahoo.com>
Merge pull request #531 from aPunch/master

Enchantment progress