Repair repair, at least start

@emanuele45 please look this one over.  As it was it did not run,  now it seems to be loading things etc.  I think this is going to need more work, its a bit of a mess really.