Reorganized, very basic test

Totally forgot about numbers. Have to change my output format to handle
numbers in the input.