redid pretty much everything, cleaned up tokenizing