merged
displaying some goodies
still needs work but getting there