Source Maps

**Ready to merge**

Fixes source map support (it was broken while fixing the tests yesterday)