Refactored again, added problem 67, cleaned up problem 1.