wip: add typed variables