rebase and fix stuff, incorporate image and padding layers