Added Mocked uo Subject line code and a few mods