Wip
Add tests