Design Done. Cleanup Needed.