Using a session table

closes #25