got the basics working. Next - tests