Adding support for basic 2-digit numbers