Towards Storage And Retrieval Of Non-Classical Light In A Broadband Quantum Memory - An Investigation Of Free-Space And Cavity Raman Memories