Fixed all shit, now we have to do it beautiful