Adfamey V2

Implementing almost ready reinvented design.
Handled conflict

This is fixed