Add some display intelligence
Save state and add custom numbers