in progess of making units tests