shifts are now split around penalties, pulled import_lines out of the make_lines namespace