Fixed errors - now has 'filestore' functionality