Put some limits on ID arrays and put TODOs in place