Refactors in numbers and adding locations draft version