Starting file service changes.

NOT IN GOOD COMPILE STATE