ENH: Better organization, incrementally closer