Lot of changes...
Some updates, adding delegate
Some changes, work in progress