Moving __init__ to the correct spot