Moving Toward new DIApplication and DIWindowController - Broken Commit