For #15: Refactor to support rotation easier