[wip] Implement several new spacing rules