weave and cat added, likely will rename