Converted to Display object; visibility toggle

Still more to do but most encapsulation is decent