Feature/pretty pictures

Still a work in progress, but getting there!