Added all the shit from my old #317 hyperion.