replace .number w/ .percentage
merged Franz changes, router kinda works