Working on unit tests and the rest of the implementation.