Using __init__ properly now