After initial code review. A few TODOs to clean up