More progress (WIP)