TO-DO: Add UNIT tests.