trying to make it usable for tomorrow