Moving TODO to #51