fixed out dated context, fixed cors issue, added some code for next phase