Finished spirit mechanics
Merge conflicts