Develop

Closes #1 and removes file-only setting