major design update
Merge github.com:danielsnider/show_tell