- some refactoring and preparation for full tesing done.