Initial class commit
Add test plus debugs