* pulled in levinson from staging. * simplified trilayer handling and some other linting that bit me in the last code review * formatting
Christon DeWan