more work
debug + better docs