Iteration 2 plan
Merge pull request #144 from enkeboll/ae_iter2

Iteration 2 plan