various refactors and reverting to mvg with NApad vs padNA