187 embedded chart in builder

Note: I *tried* using rebase to squash things, but I seem to have made it more confusing.