cleaned up code make sure other can't interact with our files and WIP custom handler
Merge remote-tracking branch 'origin/master'