WIP: completed session input
bug fixes are needed