pretty much done, maybe clustering tomorrow