Decouple Content from Code

Here we include the changes from !3 (merged), and attempt to decouple content from code for #12 (closed).