Add nested functionality
Resolving merge issues