Moved to pika and vastly simplified