Begin refactoring to cleaner __init__
Begin refactoring to cleaner __init__