When @bryansills gets his code pulled in we should take this out.