A little more progress, got the wires cleaned up into one small area, cut a bunch down and put everything pretty well in to looms. Still not sure if I cut too many out, but here in the next week I am going to put new plugs in, get the last few random wires hooked up and see if she will idle...