Added objects and display stuff to __init__'s