Shuffled some implicits. A bit more of this is probably needed.