Initial Implementation and Tests
Fix test failing
Screencast