Various work. This is the commit before the complex cow stuff is removed.
Removed old cow stuff