More Decoupling

Did more decoupling, and it works right now.