Finally got specs passing - hooray.