Working on some design stuff that we still need to figure out