Update for BEM methodology
BEM-ize the rest of it