So this is a huge commit, and it might break everything angularui