Feature/iss5

### Unifiying the code base for future implementations :cake: