Move some stuff so that for better debugging

This way, if players stop debugging there horses aren't all magically
trained to be tame.