wip: turn inputs into separate components