more sever work from last night, added request handling