Created a new number parser and reorganised logic