Do this thing properly