finished up anon stuff and design stuff
Merge remote-tracking branch 'origin/eric' into bala