And let's do this right too