Addresses TODO items.