ditching MATE - bringing in the nimbus stuff