Initial Horse API changes.. untested!