Added Number&Name Fields

Manages to exit on screen close.  That's a bug that needs to be fixed.