added conditionals and special operations, bit more architecture
Merge pull request #2 from yetanotherhacker/conditionals

added conditionals and special operations, bit more architecture