WIP: some more steps toward the victory...