First pass at preparing tokens