Display code mostly working
merging back