importing panos' v2 patch
source maps test passing again
remnoving logging
all tests passing again
OMG OMG OMG OMG IT WORKS
fixing broken rebaser
Responding to Panos' feedback