Use absolute paths and propagate arguments
Update TODO