now with tests
next button, more working