Added basic expressions, refactored.