would be nice to not have to copy/paste this...can you move it to a module that makes sense (or its own)?