Add more settings
Rename 'name' argument to 'filename'
Push things around some