I know that makeToken was in manufacture before, but I think that with the new OOP design we should move it.