@jasondegraw Would also be nice if this were const