Development chris

Build should be clean and able to be integrated