Feature/dev work

Hoping for feedback