Closes #10. Created files for #11 and #12.