New augmented design file. and main cleanup code again.