memory problems
more unit testing