Actually since you moved this, might as well move them to a new file.