Huge refactor ...
fixed compiled
Brombix merge
Clean up adapters