Finish off padding implementation