Added some temp test stuff -- will revert some later.