Cleaned up spirit charms implementation [WIP]