#11 refactoring in porgress...