Working code & unit tests in place