Noted a few "todo" problems arising from some trunk features being unaccounted for