Changed approach, lots of work still needed.