Changed architecture to support the decorator pattern. Added unit test project.
Debugged Test and Interpreter
Fixed looping bug.