I got it working again
About to merge