More work on souls, added a custom entity