Start working on padding handling