Expand API, stub out more fs