Add parent and child methods...also fix some bugs