WIP New subnet layout