Almost complete with implementation
Completed and tests are green (locally) =D