Commenting done for now. Still need to fix the sessions issue... :(