Sources are now properly encoded, needs validation on input though