New features added, unit tests are working.