Improving structure, specs still failing