More Refactor, we're almost there =)