(wondering if this whole library can be removed now)