Dogfooding

closes #22
closes #20