Nod to both comments. Do you want me to rebase that code or will you restructure it as part of adding tests?