Did a couple of minor refactorings and marked another failure