Yeah, this'll get much simpler now