got it to mvp status... still needs tests