added conditionals and special operations, bit more architecture