Dev. checkpoint. Right before simple-fying func finder.