This just moves to code to the same file, but we want to merge the implementations as well at some point.
