changed the entire system to make everything significantly more expressive
removed old example