More work on session form