More re-factoring coming to a branch your way :)