filestore

updated for code review