start refactoring
bump version