Initial Nimbler changes.