Updated design and added cleanup to main file.
New augmented design file. and main cleanup code