Time to finally do this right