a hard nights work trying to fix IC2 fixes #3 working towards #5