Committing all the location code, stubs included