Added basic aritmethic, generators and an aggregator stub