One epic commit more, pets and items work