Move code from comfortable mexican sofa to our cms application