Content mostly done

[Issue #3]

Consider some refactoring later