Moving some of our functionality out of __init__.