WIP: add padding to deal w/boundaries