still failing specs but things go a lot faster already