New style, much changes, such commit, almost done.