Rewrote Converter class, cleaned up unnecessary Token classes, added some tests.