start cleaning this up too
start consolidation into __init__.py