Aside from the extensive client-side work, this TODO will probably be the next priority.