Spirit stuff

Change-Id: I93b05a977895a16134567f905768e0c2052d15a3