Changed the way that the string is evaluated. Also, changed some class names to better reflect their funcionality.