Cool, I'll try and take a crack at refactors this weekend, or feel free to do yourself if you prefer before I get to it (it's your project after all :-} )