First commit on own fork. Used for implementing Genie into SHIP