adding in dependencies and custom code
Fixing merge