@wip Prep for input inclusion