Code working
All unit tests work