Feature/spirits

Attempting to do a pull request for my own stuff.