Added new error handling on main template
Added SUP sesh basic functionality