Gran refactor, gran.