Still not a working version, but evolving