Fixes #14

This should get us away from using the inputParser.