at least it's in it's own function now.