Minimum Viable Product 1a

"Make check" runs successfully.