decoupling
first pass at new decoupled layout