Finalize token port over.

Todo: Play Auth via REST