Trying to move into this fork from stub, integration issues