w_dev: Huge refactor.