Made this function do just what it says and moved what used to be here to a different method.