started adding filepicker stuff, doesn't work yet
Merge branch 'master' of https://github.com/anniej42/rekindle
merge conflicts
Merge branch 'master' of https://github.com/anniej42/rekindle