End finder mostly works now