this is CLEARLY what you meant

closes #20