Start of an implementation for the padded design
More bug fixes for padded implementation