Make stuff kinda sorta work again