Would be super cool to not have to do this still :)