Snippets stuff from #79

Snippets stuff from #79, except the alternate file thing