moving a little logic out for now.