Added new test data. Moved some decode/display code around. Still a work in progress.