Added some basic data drawing