progress on dog mechanics
merge