Resolve "New input format"

This feature branch got a little too big, and contains a lot of refactoring.

Closes #17 (closed). Closes #18 (closed).