a few TODOs in this file, still needed?