Added some basic evaluation. There are still issues.