Refactor - ready for shape stats