Completed validation and hacked a quick fix for sessions