Added data structures & unit tests.