Added stubs for bar and more code for scatter