Refactored getter/setter style, added display, waiting methods.