everything working, tests to be added.