Great idea to move this into the ol extension!