Adding a couple problems. About to refactor 18 / 67