Making progress on #104, still isn't fixed yet