WIP
- Unit tests starting to work