More progress, still playing with ideas