Lots of changes. Including support for spirits.