Rework removing things to use splitting via coqtop
Fix syntax errors
Fix some bugs

I think there's a threading issue