Dave dev

Please review @skarnik-rmn :goat: