merge of graphics stuff, loking good