Started implementing availability and locality bug