added a few TODOs for tomorrow