this is mostly working...
closer...