removed todo. looking for a better place