stramlined code
session component added and work in progress