Resolved TODO

Haven't tested it yet, will report after I do. Build is successful.