ok this is a big change, I would keep this done later.