Refactor to prepare for multiple tile selection