Filewatcher

Move *SafePartialMap to Parser and remove this as a func argument