Added file selection

Also properly made the data store