Write unit tests and expand functionality.