Line, Scatter added. Some tweaking of component updating to make the API/syntax a little better