merging
some updated graphics, cant' yet access thumbnail
happy merge, i hope.