The code churn continues while I find my feet...