(#1768) - pull changes into it's own module